merge trunk
authorK. Handa <handa@gnu.org>
Wed, 24 Apr 2013 14:42:07 +0000 (23:42 +0900)
committerK. Handa <handa@gnu.org>
Wed, 24 Apr 2013 14:42:07 +0000 (23:42 +0900)
commitbe4383026ac313a4386c4e06ad511335a187f3ca
tree7e5ce4b2056a964b62f48d2fa3439ebf72d637c0
parentcf4fc3441ce7f54776115d3de1a3349ef2fb7f34
parent44e870bfd3101f473beb1ff4a9508c909fa87902
merge trunk